From 47b537b2e4306bed699acf42062df8796fef3174 Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 4 Jul 2005 17:55:59 +0000 Subject: [PATCH] Fix altitude in lowrance usr format. --- gpsbabel/defs.h | 3 +++ gpsbabel/lowranceusr.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index afdb0c510..c7dfef4e4 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -36,6 +36,9 @@ # define M_PI 3.14159265358979323846 #endif +#define FEET_TO_METERS(feetsies) ((feetsies) * 0.3048) +#define METERS_TO_FEET(meetsies) ((meetsies) * 3.2808399) + /* * Snprintf is in SUS (so it's in most UNIX-like substance) and it's in * C99 (albeit with slightly different semantics) but it isn't in C89. diff --git a/gpsbabel/lowranceusr.c b/gpsbabel/lowranceusr.c index 9169b46bf..450f001b6 100644 --- a/gpsbabel/lowranceusr.c +++ b/gpsbabel/lowranceusr.c @@ -297,7 +297,7 @@ lowranceusr_parse_waypt(waypoint *wpt_tmp) lowranceusr_fread(&buff[0], 4, 1, file_in); wpt_tmp->longitude = lon_mm_to_deg(le_read32(&buff[0])); lowranceusr_fread(&buff[0], 4, 1, file_in); - wpt_tmp->altitude = le_read32(&buff[0]); + wpt_tmp->altitude = FEET_TO_METERS(le_read32(&buff[0])); lowranceusr_fread(&buff[0], 4, 1, file_in); TextLen = buff[0]; lowranceusr_fread(&buff[0], TextLen, 1, file_in); @@ -591,7 +591,7 @@ lowranceusr_waypt_disp(const waypoint *wpt) short int WayptType; char *name; char *comment; - int alt = wpt->altitude; + int alt = METERS_TO_FEET(wpt->altitude); time_t base_time_secs = mktime(&base_time); Lat = lat_deg_to_mm(wpt->latitude); -- 2.30.2